Calculations and Functions Upgraded